Cleaned up all