Removing some problems from this branch