[#189] Code clean up, remove unused imports