Commented out unnecessary code, might delete later