Removed commented code. Sure that it works without it