added trans tags to stuff and removed obsolete code