cleaned up some un necessary stuff