Code cleanup. Remove everything useless (at least for now).