cleaned up unused code fragments