Minor Changes
Unused code removed