Cleanup

Remove vestigial folders