Removed Old / Unused code