Remove some unused dirs
Clean up whitespace