removed some code, fixes