added return false result for null
deleted temp file
using cleanup
removed duplicate/bad method