Cleaned up server for unnecssary code bit.