Removed obsolete code
Removed obsolete code / added missing use tags