Cleaned up several files