Remove unneeded functionality
Move even more stuff to ELPA
Finalize moving stuff to ELPA