fixed deprecation notice
removed junk