Removed some class dependencies