Removed commented stuff - WIP