cleaned up unncessary code