Removed some unnecessary source code