Removed experimental code, added runtime limit.