Removed commented, unrequired code