Remove components from core, fixes #49