Clean unused

Remove some unused files and functions.