Cleaned up some no-longer-used directories