Feature/static info remove

Updating some static information and removing other