Cleanup, change install to Xubuntu, remove HTPC