Cleaned up obsolete code