DEV: Remove more code