Removed some functionality that won't be useful.