Clean up header and un-used files