Removed commented includes