Removed commented dead shit