Removed opacity from transition, removed some commented out code