Removing some executables
Fixed parser and container issues