Core/Commands: Removing Part of it for testing