added check for used magic methods
cleanup