Bit more cleaning up

Just cleaning up a little bit more the files.  Goal here is to leave
only the juicy, delicious, fabulous source files behind.