Clean up, changed deps to imports