Move specific filters outside gem, cleanup