Commented out redundant code