Bug fixes

Removed fail check from code and cleared up old code