Style cleanup; Remove unuseful versions