Removed testing comments everywhere