fixed ma-502 and deleted unneeded classes