Removing Stub classes