cleaned up excess code