Removed unused func and commented out code