[DEL] remove dirty performance hack
[MOD] added documentation, removed some non-required code