Remove locking from filters and layouts.

Haven't had time to do investigate proper locking of these.