Changed certain methods in parser.
Removed swap file.