removing all unused code