Removing commented functions