Commented out more stuff