Clean up setup, code and requirements