Remove comments
Add dependencies