Removed some obsolete code.
Using newer build tools.