Cleanup
Added everything