TAMAYA-19: Code cleanup - renamed annotation, fixed bugs. Removed unused/useless code including tests.