Remove unused code parts