Removing faas related feature