Cleaned up extras