Clean up metainformation
Clean up demo metadata
Add dependencies