Cleaned up old methods used before database implementation #1