some cleanup
resolved dependency hell