removed all unused code