Removed obsolete functions/ dead code