Remove extra require and minor cleanup