Cleaned up useless objects