Clean up non related code