Changed: Removed unused code