Removed usability checks