Cleaned up dependencies for render code