Commented out unnecessary stuff