Fixes #1 - Remove deprecated things