Constants cleanup

Some outdated and deprecated constants have been removed from the static
service. Control service updated.