Code cleanup, dependency cleanup
merge with remote