Removed some unused code from earlier projects