use own system/core
some cleanup