Cleaned up installation process and removed depriciated code.