cleanup core extensions
Merge pull request #61 from grosser/grosser/cleanup

cleanup core extensions