Added status checking and removed no longer used functions from master