Removed copied sapphire class and fixed NPE on SDK project import