Removed Manaserv bits infavour of tmwAthena

Switched to tmwAthena-based assets until Manaserv is ready.