Updating schemas and removing commented code