Cleanup for better installation process