Cleaning up the base requirements