Removed commented bits