finally cleaned up all the mess