Removed Old code