Modified some methods order, remove unused directive