Cleaned up some required