refactoring - first step remove stuff