Removed optional requirements