Commented out unnecessary things