Remove unneeded 'static constraints