Include requirements and remove some code