Removed all unused code