Cleaning up requirements still