Remove unused trait
Remove YiiCompatible trait
Fix includes
Start refactoring
merge
Base