Removed some unused types
More cleanup