Cleaned up some workspace cruft