Yes I'll clean up the commented out stuff