culled all unnecessary code