Cleaned up
Added remove directory
Removed timing
Added build 3