Removed hamful code

Should address #923