Updating codebase; cleanup