Revert a59b44f..4cc0cfd

This rolls back to commit a59b44feaf0646ffde5d4f28fbced43a2cda58e9.
Updating if, deleting files.