Eliminated old code that wasn't in use